popupMenu: Fix setting ImageMenuItem's icons via strings

Commit 28ca96064bcb added support for setting PopupImageMenuItem's icons
via GIcons as well as via strings. However as the check whether an object
implements the GIcon interface only works on GObjects, specifying an icon
name was broken. Fix that to actually allow both strings and GIcons.

https://bugzilla.gnome.org/show_bug.cgi?id=789018

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index d00132ff978575708a8f199c6d304512a19accbb..cb975f5f5c47eb07f9826fdc8e78c4fac9e31025 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -405,7 +405,7 @@ var PopupImageMenuItem = new Lang.Class({
 
     setIcon: function(icon) {
         // The 'icon' parameter can be either a Gio.Icon or a string.
-        if (GObject.type_is_a(icon, Gio.Icon))
+        if (icon instanceof GObject.Object && GObject.type_is_a(icon, Gio.Icon))
             this._icon.gicon = icon;
         else
             this._icon.icon_name = icon;